summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-10-19 01:30:29 +0200
committerGitHub <noreply@github.com>2023-10-19 01:30:29 +0200
commit134ecca9b0d3d6ec814c5ad850feaf917b1a347b (patch)
tree45d6d91b419691b9dbafd678ffe54a10e1ce7149
parentMerge pull request #11795 from Squall-Leonhart/D32FToOther (diff)
parentgeneral: fix build failure on clang 17 (diff)
downloadyuzu-134ecca9b0d3d6ec814c5ad850feaf917b1a347b.tar
yuzu-134ecca9b0d3d6ec814c5ad850feaf917b1a347b.tar.gz
yuzu-134ecca9b0d3d6ec814c5ad850feaf917b1a347b.tar.bz2
yuzu-134ecca9b0d3d6ec814c5ad850feaf917b1a347b.tar.lz
yuzu-134ecca9b0d3d6ec814c5ad850feaf917b1a347b.tar.xz
yuzu-134ecca9b0d3d6ec814c5ad850feaf917b1a347b.tar.zst
yuzu-134ecca9b0d3d6ec814c5ad850feaf917b1a347b.zip
-rw-r--r--src/tests/common/unique_function.cpp6
-rw-r--r--src/video_core/renderer_vulkan/vk_texture_cache.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tests/common/unique_function.cpp b/src/tests/common/unique_function.cpp
index f7a23e876..42e6ade09 100644
--- a/src/tests/common/unique_function.cpp
+++ b/src/tests/common/unique_function.cpp
@@ -46,8 +46,8 @@ TEST_CASE("UniqueFunction", "[common]") {
Noisy noisy;
REQUIRE(noisy.state == "Default constructed");
- Common::UniqueFunction<void> func = [noisy = std::move(noisy)] {
- REQUIRE(noisy.state == "Move constructed");
+ Common::UniqueFunction<void> func = [noisy_inner = std::move(noisy)] {
+ REQUIRE(noisy_inner.state == "Move constructed");
};
REQUIRE(noisy.state == "Moved away");
func();
@@ -101,7 +101,7 @@ TEST_CASE("UniqueFunction", "[common]") {
};
Foo object{&num_destroyed};
{
- Common::UniqueFunction<void> func = [object = std::move(object)] {};
+ Common::UniqueFunction<void> func = [object_inner = std::move(object)] {};
REQUIRE(num_destroyed == 0);
}
REQUIRE(num_destroyed == 1);
diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp
index 80efd9517..de34f6d49 100644
--- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp
@@ -2055,7 +2055,7 @@ void TextureCacheRuntime::TransitionImageLayout(Image& image) {
},
};
scheduler.RequestOutsideRenderPassOperationContext();
- scheduler.Record([barrier = barrier](vk::CommandBuffer cmdbuf) {
+ scheduler.Record([barrier](vk::CommandBuffer cmdbuf) {
cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, barrier);
});